bitkeeper revision 1.1159.183.26 (41aa39f1OUstYltr5AB2bxV3-Egkmg)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Sun, 28 Nov 2004 20:49:53 +0000 (20:49 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Sun, 28 Nov 2004 20:49:53 +0000 (20:49 +0000)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk


Trivial merge